| commit | 491450facb79962cf8af096f7db02560e9d8dd48 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 07:36:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 15 07:36:54 2013 -0700 |
| tree | 5ae12c748f74ec4178b2103e7b373adc93a9a7bb | |
| parent | 06fdc62132e149bc0164d706bfdad8975df1a4ec [diff] | |
| parent | 8c20de34bd3302b6a594b33afab4ff90303a5dde [diff] |
am 8c20de34: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '8c20de34bd3302b6a594b33afab4ff90303a5dde': "JSS11I" "JSS11H" "JSS11G"