tree 4deb26de859afcfea8efa8958f460121a20a7577
parent be05c48040e5a44bc980c19e58d9c4b3316be164
parent 642cc64d37c6ba57f3d1567c47418b0e76b88a4b
author Dmitry Shmidt <dimitrysh@google.com> 1485466942 +0000
committer android-build-merger <android-build-merger@google.com> 1485466942 +0000

Merge "Cumulative patch from commit 05e5e615e6a26d7a9f5bd0569a0baeae1bcdee49"
am: 642cc64d37

Change-Id: I45b12995296481d8d967aa1248e4aa632a2a2965