| commit | 87b319cb9673bf32c0f1c69ad70211ae6b248425 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 13 22:31:05 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 22:31:05 2013 -0700 |
| tree | f16937f99a210f355bb5efc0fe0b82fd64d3722f | |
| parent | 7e0bd69e3f230f53b60bc89d25acf6c06c920384 [diff] | |
| parent | b3ce93461480575c5e9e7bf2bbc9d11b2b714c85 [diff] |
am b3ce9346: am 91e4fd6c: am 61ea9d98: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b3ce93461480575c5e9e7bf2bbc9d11b2b714c85':