| commit | 9bd75be91655452eb897417ea949d1eb065413cf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:37:52 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 15 09:37:52 2013 -0700 |
| tree | 07f0c17eacda1d0a287d1c52aa607b74a8c93c74 | |
| parent | 0f22367bae1d5c4f35c0ee6384c131d1670a0cac [diff] | |
| parent | 01aa9db4f89683c823ef57939650a67db3c6071c [diff] |
am 01aa9db4: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '01aa9db4f89683c823ef57939650a67db3c6071c':