| commit | ddd466abc1efa8a603eb96b27c1109965254b61b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:48:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:48:22 2013 -0700 |
| tree | 12b08829177cdc3726c72b8e16b4723e7bba0be4 | |
| parent | 59eaeed5fabc27942d62327fa460ebb8bd2f3822 [diff] | |
| parent | 92cf355308ffb28f8a460d69915ca5955016a632 [diff] |
am 92cf3553: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '92cf355308ffb28f8a460d69915ca5955016a632':