| commit | 4177ffd2ab90fb8b5d5d68b804ec1916fd656d8c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:28:02 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:28:02 2012 -0700 |
| tree | 44bcce495cb9b4e5865b481b41ef3e884b721726 | |
| parent | e2ca21cdc583071c19a4fe2dcb67f25dbdd32fe1 [diff] | |
| parent | 992b10f49def736e424b9d6e01130de28b09cd1f [diff] |
am 992b10f4: (-s ours) Reconcile with jb-dev - do not merge * commit '992b10f49def736e424b9d6e01130de28b09cd1f':