tree 53747cad3da5fe3c91d6f61ee92ae12aa746fecb
parent 8d9db3c8417c860b9241ffaa456c743c505d945e
parent 52ed47fbcfdec2e5c440da4b68ed0ea202075ab9
author Dmitry Shmidt <dimitrysh@google.com> 1456353331 -0800
committer Dmitry Shmidt <dimitrysh@google.com> 1456353331 -0800

Merge remote-tracking branch 'common/android-4.1' into android-hikey-linaro-4.1