tree 47f73937f9395b298b6bdac6dc9ca25701732ec4
parent a4c356cad7de0ef30faeaeadacd21b6eae913541
parent a924076b4f4f8bb77142c928cb7ca24f684c2818
author Michael Jurka <mikejurka@google.com> 1350575319 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350575321 -0700

Merge "Potential fix for bug 7352816" into jb-mr1-dev