| commit | b9c3c6a0c635fcff09cc7cbe62eaad60dd1dd277 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 18 11:51:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 18 11:51:23 2013 -0700 |
| tree | 7e09dcf61e9a816e79b3b1849ac42094ec766968 | |
| parent | 42d96a40123e409be8076f01b45dd422dad01209 [diff] | |
| parent | 9bc8a1b206dcd1ebba2738778ba32d25524a4f4b [diff] |
am 9bc8a1b2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '9bc8a1b206dcd1ebba2738778ba32d25524a4f4b': "JSR78B"