OSDN Git Service

Merge "Updates based on API council guidance." into oc-dev am: 3ba7117164
authorJeff Sharkey <jsharkey@google.com>
Mon, 1 May 2017 18:52:23 +0000 (18:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 18:52:23 +0000 (18:52 +0000)
commita03c9d1640b78c15c2dcf5ab0238ed8751ac10a9
treebba2001f88ff5b42d247e5f1a2a5ee4c4975a13e
parent245bcda2c6eb7db8aab4cd0b62d0f6aafbdd2e44
parente13d60764cc90406c75bf1641c9d5a7cc3e265ea
Merge "Updates based on API council guidance." into oc-dev am: 3ba7117164
am: e13d60764c

Change-Id: Ib0a727b11cc24c20d10adf9df85df100f603a87f
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/app/ActivityManager.java