| commit | 81a8bb1ca9df314faf6de09cc2da0a1db70c7391 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue May 07 16:12:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 07 16:12:14 2013 -0700 |
| tree | 5dfca4f33cf88fca5bbb44d81ff805b70e66366a | |
| parent | 02f7f449739ae3429b0bf834cebcb2b1bcade8c1 [diff] | |
| parent | 0974061e941f3aa8c3c5c71ca996be5f93a6a865 [diff] |
am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be * commit '0974061e941f3aa8c3c5c71ca996be5f93a6a865': DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be