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