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