| commit | 2db56364523c9af650729d0c9ef9ab3cae0ed847 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 16:48:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 14 16:48:43 2012 -0800 |
| tree | e88a7ed460f83a2ba1b023de1bdab4aea06cba44 | |
| parent | 3a990aee1e4b1ef37fdb6cac19aabaf711200f50 [diff] | |
| parent | d1b25b86ad8eca832ccb1af43e3992d9441b8bfc [diff] |
am d1b25b86: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'd1b25b86ad8eca832ccb1af43e3992d9441b8bfc': JDP75 JDP74 JDP73