| commit | 62bb3d1ba2d2d1b84e67d31ab3a82f0911888bec | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 26 14:03:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 26 14:03:33 2013 -0700 |
| tree | c0299788496450bd423d7c1fb99251f46c6acd1f | |
| parent | 71e3752cc1974150043e2eea100fd8a63da2340f [diff] | |
| parent | c6403d3279e510351cd02ce2336a0659945c0242 [diff] |
am c6403d32: (-s ours) am bf9dee93: (-s ours) am 1101889f: (-s ours) am c999d0cb: (-s ours) am 7fce7d56: (-s ours) Reconcile with jb-release - do not merge * commit 'c6403d3279e510351cd02ce2336a0659945c0242':