tree 080a5dffe1f0e648638ccf6dc0b4e2211a1c7e57
parent 6dfe0b4a28ce267cdd465479fb7d6b3a740246e4
parent d8c45a773bac76e34c85c584e5c344d994039536
author Dmitry Shmidt <dimitrysh@google.com> 1493229895 -0700
committer Dmitry Shmidt <dimitrysh@google.com> 1493229895 -0700

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