| commit | c6f681d1313c926d636a78e5ebc3ff1f93cf5b6e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:08:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 08:08:06 2013 -0700 |
| tree | 11aca3b6968ee538b48136d6caee11a3db330847 | |
| parent | e3f9071e0daef6e5fe38aa4d40aabd3716eb3e54 [diff] | |
| parent | b2bc33315824ee880b319a2eb69018dc44d1026e [diff] |
am b2bc3331: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'b2bc33315824ee880b319a2eb69018dc44d1026e':