| commit | d15c8737ce3c38bfd762667dfc52a537a4b66c73 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 11:18:49 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 11:18:49 2012 -0800 |
| tree | 064445dc08e804a406ef039a5f655aef134da3be | |
| parent | d052eb6b47efe2ffb85e1bbd831a00d39f3ecccc [diff] | |
| parent | 92b7fbf8725fed5bfa3cae7c26d09e813b3ae920 [diff] |
am 92b7fbf8: (-s ours) am 414aadc7: am 3bf2fcf9: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '92b7fbf8725fed5bfa3cae7c26d09e813b3ae920':