tree a99e9002cb308fb366567dea156cf3c614df8ba4
parent 4ef9e777f3f39f2adf2acd849d9aec38f7a84a85
parent ae311dd348c36c03a9e8d6a5d89d4fcbdaa069d2
author Sergey Vasilinets <sergeyv@google.com> 1501183012 +0000
committer android-build-merger <android-build-merger@google.com> 1501183012 +0000

Merge changes Ibb91f4b2,I7f2acedb into oc-support-26.0-dev
am: ae311dd348

Change-Id: Ib9cc699740d00a801c4b5a2bd09e66716c55dbe5