tree 38924f0bf93aa252cf21319ce8c452897548a58c
parent 22633f5b9605bbd7d61709b40c4592739c0ed707
parent f48130278fddf30925cb36023e2a2c8e7c15569a
author Nick Kralevich <nnk@google.com> 1441141723 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441141723 +0000

Merge branch 'mnc-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/system/core into mnc-ub-dev