| commit | 7e0bd69e3f230f53b60bc89d25acf6c06c920384 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 14:31:37 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 14:31:37 2013 -0800 |
| tree | f16937f99a210f355bb5efc0fe0b82fd64d3722f | |
| parent | 1450c47ba8cf327d9681eb34fda0754feb208ff9 [diff] | |
| parent | 12b61826cdee963d0d01f29bf03c11f735f08a41 [diff] |
am 12b61826: am 61ea9d98: Reconcile with jb-mr1-release - do not merge * commit '12b61826cdee963d0d01f29bf03c11f735f08a41':