tree 148c5221b8f54a997d505d0db23593363f4cf0e2
parent 1db7f9dce648b51d6ea55e540754a8aff2d5c2ed
parent 1a825e9e8390cc78dd41cf9e176f5500879ddb09
author Dmitry Shmidt <dimitrysh@google.com> 1478719245 +0000
committer android-build-merger <android-build-merger@google.com> 1478719245 +0000

Merge "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950" am: c15e6e5191 am: f23fbc6dff
am: 1a825e9e83

Change-Id: Iea56b57eb72a22d52d270686659903b0cb5006b5