OSDN Git Service

Merge commit '2aaa8a6ad5ab9f36075c642bd41bfaf5f43fa0a7' into dec10
authorJeff Sharkey <jsharkey@android.com>
Sat, 29 Apr 2017 17:32:50 +0000 (11:32 -0600)
committerJeff Sharkey <jsharkey@android.com>
Sat, 29 Apr 2017 17:32:50 +0000 (11:32 -0600)
commitcb32d062f02fe20bfd500b16204ff82fae813f9d
tree715ea7ca23438aa40754c0d8e5f5f6956f04324a
parent15971f832851040bf0c7a66b9fed0aed2f4636e9
parent2aaa8a6ad5ab9f36075c642bd41bfaf5f43fa0a7
Merge commit '2aaa8a6ad5ab9f36075c642bd41bfaf5f43fa0a7' into dec10

Change-Id: I7940f41fe5906377f357a6cd711fa3e1660ebef1
api/current.txt
api/system-current.txt
api/test-current.txt
core/res/AndroidManifest.xml