| commit | fe6b2c34ad3b7ec9aa6dee9afe562234a8099fca | [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 | 8764f3f3e62643c666c570f152f434530d8b1de3 | |
| parent | d9f84a357c621776dc92aa7f45eadc42b4431a5f [diff] | |
| parent | 4d60276e7c3adf0f6d279688cb8cd0ebba22d322 [diff] |
am 4d60276e: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '4d60276e7c3adf0f6d279688cb8cd0ebba22d322': flo: update prebuilt kernel, DO NOT MERGE