summaryrefslogtreecommitdiffstats
path: root/wifi/java/android
diff options
context:
space:
mode:
authorEric Gilmore <egilmore@google.com>2015-04-02 02:58:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-02 02:58:42 +0000
commitae896d318820ca5c4202c57608d4426fc9f3d798 (patch)
treed987d35ad0d87fbb2670307429ca040808c9c209 /wifi/java/android
parentd14f7f12a194668fd84f946b82f8a540004af472 (diff)
parent82a7e2a8dde29613dacf2add9be0acc867ffb576 (diff)
downloadframeworks_base-ae896d318820ca5c4202c57608d4426fc9f3d798.zip
frameworks_base-ae896d318820ca5c4202c57608d4426fc9f3d798.tar.gz
frameworks_base-ae896d318820ca5c4202c57608d4426fc9f3d798.tar.bz2
am 82a7e2a8: am a16d42cd: am 7278d89c: am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '82a7e2a8dde29613dacf2add9be0acc867ffb576': Changing wording to reflect c2dm shutdown.
Diffstat (limited to 'wifi/java/android')
0 files changed, 0 insertions, 0 deletions