summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-03-03 17:54:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-03 17:54:27 +0000
commit9a447bcc6ef9be7933cd7197a80f51cbc159cf85 (patch)
treeadf714010d26eca055b2bf3a5580168c4f7df3d0 /core/jni
parent7a3dc08a28ee165fb42c68075f43b01043667940 (diff)
parent246a3a4a797edf5850073ec8f6b8aa997947d09b (diff)
downloadframeworks_base-9a447bcc6ef9be7933cd7197a80f51cbc159cf85.zip
frameworks_base-9a447bcc6ef9be7933cd7197a80f51cbc159cf85.tar.gz
frameworks_base-9a447bcc6ef9be7933cd7197a80f51cbc159cf85.tar.bz2
am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b': Minor typo fixes in managed profile Javadoc reference pages.
Diffstat (limited to 'core/jni')
0 files changed, 0 insertions, 0 deletions