| commit | 2dc17bee012601e5fcfd490321b39b1dd3115b67 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:24:26 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 07 10:24:26 2012 -0800 |
| tree | e71a7efce51438722034e19cbcfb0936fae31e0d | |
| parent | a641a3107a043f7824fdac472ff7d3293d23bd79 [diff] | |
| parent | 9b1b7bbeb464baa3a28fa8c0b74aa10d83893b7e [diff] |
am 9b1b7bbe: Reconcile with jb-mr1-release - do not merge * commit '9b1b7bbeb464baa3a28fa8c0b74aa10d83893b7e':