| commit | 0974061e941f3aa8c3c5c71ca996be5f93a6a865 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue May 07 16:05:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 07 16:05:58 2013 -0700 |
| tree | 5c28f6ddf22ccc928f73ae985cb5e7670c6852bd | |
| parent | 9207be9078a59ecd93073e6892c5c75b47b342d6 [diff] | |
| parent | 1181564fc482171c4c9a84b3c7c1f06ca6eaf2b6 [diff] |
am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be * commit '1181564fc482171c4c9a84b3c7c1f06ca6eaf2b6': DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be