summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-01-22 02:45:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-22 02:45:16 +0000
commit54dbd1fd437862346f7cdacc484acd3e10501bfb (patch)
treef0396ddc3de5d5db3b2834d7ddac385565e3b7df /core/java/com
parent8175e7b3640b9aa0df192c2abf59ba124486df7b (diff)
parent0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2 (diff)
downloadframeworks_base-54dbd1fd437862346f7cdacc484acd3e10501bfb.zip
frameworks_base-54dbd1fd437862346f7cdacc484acd3e10501bfb.tar.gz
frameworks_base-54dbd1fd437862346f7cdacc484acd3e10501bfb.tar.bz2
am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49
* commit '0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2': Clarify getTrustAgentConfiguration() documentation.
Diffstat (limited to 'core/java/com')
0 files changed, 0 insertions, 0 deletions