diff options
author | Michael Wright <michaelwr@google.com> | 2015-02-11 20:03:06 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-02-11 20:03:06 +0000 |
commit | 62958c7f3009f97dc185457feb01707d1eba740e (patch) | |
tree | 9c5a8df7fe979d772902053887cc9ecfdef7888a /wifi/java | |
parent | d08860690c1aa087871e14c841524e7ce3c0a4f9 (diff) | |
parent | c093955af1434a7023093acb148ab152d915e59c (diff) | |
download | frameworks_base-62958c7f3009f97dc185457feb01707d1eba740e.zip frameworks_base-62958c7f3009f97dc185457feb01707d1eba740e.tar.gz frameworks_base-62958c7f3009f97dc185457feb01707d1eba740e.tar.bz2 |
am 33bb70d6: am 40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e
automerge: c093955
* commit 'c093955af1434a7023093acb148ab152d915e59c':
Diffstat (limited to 'wifi/java')
0 files changed, 0 insertions, 0 deletions