OSDN Git Service

[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
authorBernie Innocenti <codewiz@google.com>
Mon, 21 May 2018 17:32:00 +0000 (10:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 17:32:00 +0000 (10:32 -0700)
commit7ef34d862950508bfcae846e48589e9cb3ddb95a
treec88104592b53ad3669f6b6e312af3e711ebe7c35
parentdee99a1b2b79a424a53b885fd9d3c40f3a8e32e3
parent0ec7b1e85ee0ad496f40015b71f00e40672f8e7d
[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
am: 0ec7b1e85e  -s ours

Change-Id: I8fac093bd2a55d6c59856374fa31d88207fc7623