summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2014-03-06 01:03:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-06 01:03:09 +0000
commitedf0b79d55df17fddb6b96de32f34ffccc8ec2d4 (patch)
tree84345743580a46d08d5096e1c5f4c205adff21e0 /docs
parent9c9185348ad2487aad043c565fe221b4a56ef0b9 (diff)
parent24ea88a986cfb6de7197b213ad933a6eb6f0e285 (diff)
downloadframeworks_base-edf0b79d55df17fddb6b96de32f34ffccc8ec2d4.zip
frameworks_base-edf0b79d55df17fddb6b96de32f34ffccc8ec2d4.tar.gz
frameworks_base-edf0b79d55df17fddb6b96de32f34ffccc8ec2d4.tar.bz2
am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."
* commit '24ea88a986cfb6de7197b213ad933a6eb6f0e285': Validate objects are from the correct context.
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions