| commit | d397be39eb7db29f3a52f63bf34c370ff0eaed6b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:49:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 14:49:16 2012 -0700 |
| tree | 3c88376ce8ba1c42456585fe0845c286358ee661 | |
| parent | 0ed29970de04e9b96c9b1298690c3b38d16d5f87 [diff] | |
| parent | 215695fe5e84f1fd7acecf1bec68c6dd69ea3247 [diff] |
am 215695fe: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '215695fe5e84f1fd7acecf1bec68c6dd69ea3247':