| commit | 75bcd737770f85114673c4411b8e2ecc0dd32bdf | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:50 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:50 2013 -0700 |
| tree | de4b9fce9ad3e87543de1a4335f9f1d3d97d426c | |
| parent | f53f9c6d3668490f6c68f5c094c28f645c1b3da3 [diff] | |
| parent | 4ddcb75861cfb2835fcc20f2071222d2f55450ba [diff] |
am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4ddcb75861cfb2835fcc20f2071222d2f55450ba':