| commit | b1cfada58a7a259e527e025b2b69806ef8121a57 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:54:39 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 01 07:54:39 2012 -0700 |
| tree | 5862b78d667371e87353d024d877a07edf11fa94 | |
| parent | 85bade19e46fd326f1a4bf97424ef0ad697fbc81 [diff] | |
| parent | 19409cd098ff01560443298f40652953222da067 [diff] |
am 19409cd0: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '19409cd098ff01560443298f40652953222da067':