| commit | 17cbfdda28584c5e5fbf67237b8250a1e48e77bd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Mar 06 18:10:49 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 06 18:10:49 2013 -0800 |
| tree | 16c669af2f21d9cbc58c5abbb754e18429668f1d | |
| parent | bfeae36ec422e9ee5e75f521e5e0f73787ed0010 [diff] | |
| parent | 76bbd39a91e87ab39ce866f3b8682a28729d16f2 [diff] |
am 76bbd39a: (-s ours) am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '76bbd39a91e87ab39ce866f3b8682a28729d16f2':