aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-07-15 09:34:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-15 09:34:23 -0700
commit1f5799d52712d3d896079e439ae73b7599e17308 (patch)
tree326c5f0b751931ea2d6a42cef980a126754a5b2e
parent74db1f3409b8debd61afdd17a0b0884803f28d7e (diff)
parente3f5df60ce35333a7df23f726905f4bb328abc8f (diff)
downloadsource.android.com-1f5799d52712d3d896079e439ae73b7599e17308.tar.gz
am e3f5df60: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'e3f5df60ce35333a7df23f726905f4bb328abc8f':
0 files changed, 0 insertions, 0 deletions