diff options
author | Filip Gruszczynski <gruszczy@google.com> | 2015-02-06 00:15:12 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-02-06 00:15:12 +0000 |
commit | 3f579c71674784aebb673d4c82abe63e86883546 (patch) | |
tree | 801fe37762f280a268cc21be3d755788d6553e31 /core/java/android/webkit/CookieManager.java | |
parent | 83f367475b71ea1abd78b88e70c219c00f2af110 (diff) | |
parent | 943c09d7204b15aadce041508972517763701cd3 (diff) | |
download | frameworks_base-3f579c71674784aebb673d4c82abe63e86883546.zip frameworks_base-3f579c71674784aebb673d4c82abe63e86883546.tar.gz frameworks_base-3f579c71674784aebb673d4c82abe63e86883546.tar.bz2 |
am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev
automerge: 943c09d
* commit '943c09d7204b15aadce041508972517763701cd3':
Add hidden shutdown method to PowerManager.
Diffstat (limited to 'core/java/android/webkit/CookieManager.java')
0 files changed, 0 insertions, 0 deletions