| commit | 58ac276242d6fd28324bb9c0f09aff64765c4d8e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:59 2013 -0700 |
| tree | 8e0dbe1ea2c67bc377199713d584b9aefd040af2 | |
| parent | e1b99ca8589f7f5bc0b019f7b50b8776a8f85bf0 [diff] | |
| parent | a03f07f013265d3e5f8ee36184c613d9b5032c11 [diff] |
am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a03f07f013265d3e5f8ee36184c613d9b5032c11':