| commit | 0049a47e7be990283e235de19d9cd6ef75528fd2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:55 2013 -0700 |
| tree | 21d58966b88836c2c4ef0d6f74445796b3b98470 | |
| parent | 9ae4c3d319f915c4619f0269933a1daa39b0c486 [diff] | |
| parent | 834f2f664ea49405e641c780c44efd8d31a49910 [diff] |
am 834f2f66: am 61d900bd: (-s ours) am 28bf428c: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '834f2f664ea49405e641c780c44efd8d31a49910':