| commit | 25af46b07d0dbe0f5800a17c231942e4eea7aa99 | [log] [tgz] |
|---|---|---|
| author | Heidi von Markham <hvm@google.com> | Sat Jun 06 00:07:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 06 00:07:02 2015 +0000 |
| tree | 433746b12f41e8969ed098cca068cd74966c8798 | |
| parent | c37d84ac087717744e2c0df05a80fa829e6039a2 [diff] | |
| parent | d3bc26a853c881f43877b775da122cb72d140077 [diff] |
Merge branch 'mnc-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev