| commit | 11f5f98482e8cf1f237488aef6fef5cea8f9a900 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:57:15 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:57:15 2013 -0700 |
| tree | 83ddbcd4f6246246cca0dbfdca3c8fafb120abdf | |
| parent | 7f74dea7a833b7c9c0370ce81decc21d44bda7b3 [diff] | |
| parent | 623bb0c79e3fd8bbf717505e7cff2ee2b009519c [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Ide168995c4998dc00d65ced6e3187985566f8f49