| commit | 3b5b9c73d034dae25ec537edfbdea60f273d3c46 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Jul 23 19:06:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 23 19:06:26 2015 +0000 |
| tree | 8adbeb3f09356bc4f029b520805edf0596680429 | |
| parent | 1839b107acb0a9432d80a3521fd54cc3c3c63e6a [diff] | |
| parent | 6f1e3c56a7a0c7e56db9393e0e1dea99b627dfb5 [diff] |
Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev-plus-aosp