summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-06-26 12:37:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-26 12:37:50 -0700
commit7d99328bb96474b99c902d97780ba96d95ec8d6f (patch)
tree756e1fe0ef128afc1fa9ab29c9de0eb48d824ffa
parent88dc28a563f05e5cd1a28a8a177762bfc328cb30 (diff)
parent5ff9a453b4335f685418287f27bfb6f37ccd6ff1 (diff)
downloadpower-7d99328bb96474b99c902d97780ba96d95ec8d6f.tar.gz
am 5ff9a453: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '5ff9a453b4335f685418287f27bfb6f37ccd6ff1':
0 files changed, 0 insertions, 0 deletions