tree 789ccd45efb63f8dc6e9b8b4a2e3319f103aa22a
parent aa0fd1cb5d2c5b0d501558c55ddb602553a0e17e
parent d950b7b5f303a534313070cfbee66f6ab0d05c16
author Tomasz Wiszkowski <ender@google.com> 1497549836 -0700
committer Tomasz Wiszkowski <ender@google.com> 1497549836 -0700

Merge commit 'd950b7b5f303a534313070cfbee66f6ab0d05c16' of persistent-https://googleplex-android.git.corp.google.com/platform/system/core into OCSYNC

Change-Id: I71eaacaabf99c31c0904c40c2eafe57c366b0432