OSDN Git Service

Merge "Finalize resource IDs for N." into nyc-dev
authorMichael Wright <michaelwr@google.com>
Fri, 27 May 2016 03:31:15 +0000 (03:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 03:31:15 +0000 (03:31 +0000)
commitc37fb8aa6e2094336201840ec0a44aa0a5ad6913
tree88e531330ba15b25f4eed9ab24a1b84002806a06
parentd76cc5d10764d8e70b06229f6290bca9cd351fe1
parent7bbab7e440c4968a5710d31f86168a4c8de66af9
Merge "Finalize resource IDs for N." into nyc-dev
am: 7bbab7e440

* commit '7bbab7e440c4968a5710d31f86168a4c8de66af9':
  Finalize resource IDs for N.

Change-Id: Ied7ef4d95a5ef5ad8100db724a6bc71f916f9f22
api/current.txt
api/system-current.txt
api/test-current.txt
core/res/res/values/attrs.xml