summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/12
diff options
context:
space:
mode:
authorSander Alewijnse <salewijnse@google.com>2014-11-07 22:39:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-07 22:39:38 +0000
commitc4ba2174743c877e28bb28e7ff50bc7a55a660fc (patch)
tree2644621977acb276c3e7dacaf8f60521194cbe75 /docs/html/sdk/api_diff/12
parent75d1cbd71b6ac72588b687c8191a0ceded183b39 (diff)
parent1b0dbd5c954b61e2ee95f87817a1ec0e7d242b20 (diff)
am 1b0dbd5c: am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
* commit '1b0dbd5c954b61e2ee95f87817a1ec0e7d242b20': Added the restrictions pending application restrictions key.
Diffstat (limited to 'docs/html/sdk/api_diff/12')
0 files changed, 0 insertions, 0 deletions