| commit | 62752611e864f14768615e0b22184feb66993e78 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:34 2013 -0700 |
| tree | f7d2a206b03920b6c819925f52a99afd80a2b9ab | |
| parent | b17443674f6c5fe12f9658ceb40e357f2b5bbf2d [diff] | |
| parent | 1954242cb27c68ef311abb3fa12c607145a10d7b [diff] |
am 1954242c: am 83e25988: (-s ours) am 294cefd4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1954242cb27c68ef311abb3fa12c607145a10d7b':