summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/12/changes
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-07-27 18:26:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-27 18:26:27 -0700
commit66fead422792a4854aab10c22c1428324bf70707 (patch)
treeb2aed9efc8691d214df3d3065fd114d98c8ed10f /docs/html/sdk/api_diff/12/changes
parent4316da201ddbca5f5c1886b591eed6908e3b6583 (diff)
parent006ba8a226236af2189e62a221ae932344b79210 (diff)
am 006ba8a2: am af3fb232: Merge "Flatten power manager wake lock constants." into jb-mr1-dev
* commit '006ba8a226236af2189e62a221ae932344b79210': Flatten power manager wake lock constants.
Diffstat (limited to 'docs/html/sdk/api_diff/12/changes')
0 files changed, 0 insertions, 0 deletions