tree 2178b42864d58104e382f9f479879467222fc51e
parent abbc7f346d53cfac27476baa3f50d5b07a6180b8
parent 0ad6309bb52620b43fe72cd4eb1723faf58a8ac8
author Igor Murashkin <iam@google.com> 1510790752 +0000
committer android-build-merger <android-build-merger@google.com> 1510790752 +0000

Android: Merge remote-tracking branch 'remotes/aosp/upstream-gh-pages' am: 0622f2c7dc am: 641d798005
am: 0ad6309bb5

Change-Id: Idb749b4479cc7049749ef3bc1660d2dce2b51d1d