| commit | ad841479f682fa55800f7fe26a3f504ecd88829a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:43 2013 -0700 |
| tree | 7ec848fea8c09823a9734d3907e5cb13aaa412c4 | |
| parent | f7da04afb0004525be73e1f2c2d26a26d19bb7e5 [diff] | |
| parent | 0cf81ddfd00a844556e6ff851ba8a64ad27da02e [diff] |
am 0cf81ddf: am 4ff72856: am 93629338: (-s ours) am 12641e93: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '0cf81ddfd00a844556e6ff851ba8a64ad27da02e':