summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/21/changes
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2016-09-15 22:25:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-15 22:25:00 +0000
commit4ef184e57c8fa0fb941eed434ace007a914564d3 (patch)
tree4c047f3bfbfe1e3adaf1e7b509d8fe23c883a541 /docs/html/sdk/api_diff/21/changes
parentfb54782b4d00c0782b58721ff9b3b368d27c5359 (diff)
parentbf1849f7620a3d1b9c9d23421d8f29e5db211a80 (diff)
Merge "Handle charging state separately from temporary parole" into nyc-mr1-dev am: 8045bbcaf9 am: 270bc5bc2e
am: bf1849f762 Change-Id: I2666e1184990bd5614bf7eb66be57cc52965fd8c
Diffstat (limited to 'docs/html/sdk/api_diff/21/changes')
0 files changed, 0 insertions, 0 deletions