| commit | fee815efd3673907d3fcd6d4d1dbd6a2070ead46 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:50 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:50 2013 -0700 |
| tree | 4ca85ee344a724c3188d11a60f1b260dd29b263f | |
| parent | b4a3465f355a297e4df0973fae685174d397d855 [diff] | |
| parent | 0049a47e7be990283e235de19d9cd6ef75528fd2 [diff] |
am 0049a47e: am 834f2f66: am 61d900bd: (-s ours) am 28bf428c: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '0049a47e7be990283e235de19d9cd6ef75528fd2':