| commit | 1181564fc482171c4c9a84b3c7c1f06ca6eaf2b6 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue May 07 16:03:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 07 16:03:31 2013 -0700 |
| tree | dd679623406ce0527193eb7719087d4fde59fa68 | |
| parent | b80b4bfdae8d9eb7e8ad6c7a44f92d9fd2b9e6d9 [diff] | |
| parent | 42fb3abd4b7463626983c1a2768788c901f2e71a [diff] |
am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be * commit '42fb3abd4b7463626983c1a2768788c901f2e71a': DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be