| commit | dd0d27b35c36b61b1a6a3d526bc2ce7ceefeaf80 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:26:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:26:37 2012 -0700 |
| tree | aee8594b43800f6d56f8b5f78062fced5af5b5a7 | |
| parent | 50926ed43509b7d16a2c4b9375f53986cc9a28b7 [diff] | |
| parent | 5897310688b2d325dc2e437f6f3811e298b21810 [diff] |
am 58973106: (-s ours) Reconcile with jb-dev - do not merge * commit '5897310688b2d325dc2e437f6f3811e298b21810':
