| commit | 53f9c0303623d687b4823654184083d77bc23e91 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 18 09:46:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 18 09:46:51 2012 -0800 |
| tree | e88a7ed460f83a2ba1b023de1bdab4aea06cba44 | |
| parent | 2db56364523c9af650729d0c9ef9ab3cae0ed847 [diff] | |
| parent | 70c9917bbc5ccff41ea1482c444bf00f14cf15bb [diff] |
am 70c9917b: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '70c9917bbc5ccff41ea1482c444bf00f14cf15bb': JDP78