OSDN Git Service

Merge branch 'upstream-master'
authorAlistair Strachan <astrachan@google.com>
Mon, 25 Jun 2018 21:45:26 +0000 (14:45 -0700)
committerAlistair Strachan <astrachan@google.com>
Mon, 25 Jun 2018 21:57:58 +0000 (14:57 -0700)
commit5e2c4ec75165b5b167d9a4192ade2b6f62ceb3ad
treed90706cf60bf72cbd31fce2a9d4e9cf7e8b1a53e
parentf8de45da7bbfdab2b211f13371aa75dba6ae93bf
parent293d9e3edfb46d0a988f99a835be16349bea0c3c
Merge branch 'upstream-master'

Bug: 77276633
Change-Id: I28e84c7d1c280d229cca13ec6c6bd3f9c58d0455
Signed-off-by: Alistair Strachan <astrachan@google.com>
Android.mk
METADATA