| commit | 02123a48defc8a7565e091589fd7eb5bf8804077 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 07 17:32:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 17:32:43 2014 +0000 |
| tree | a71286416890b7bb9d974235a31dd2fef913fe40 | |
| parent | 756bb56a8bf9f0d1361e8d4209ced4faeab5c34c [diff] | |
| parent | fd685338c5d535a6e200b6df5dabfd3817485605 [diff] |
am fd685338: am b727ba0e: (-s ours) Reconcile with jb-release * commit 'fd685338c5d535a6e200b6df5dabfd3817485605':