| commit | 55ca246b2c4c32308d1d5a5649e9e59ae17669d3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 23 08:06:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 23 08:06:40 2013 -0700 |
| tree | dc190acefd8d657fcb579b07148c38063f6d775c | |
| parent | 8f0e6de6c7ef87df1e9319e739aa0460ed218913 [diff] | |
| parent | 94a155a41a562db983e4aa9c51bbeb39438885de [diff] |
am 94a155a4: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '94a155a41a562db983e4aa9c51bbeb39438885de':