summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-06-16 07:45:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-16 07:45:34 -0700
commit450655c10b9ab5aded4350c77a010c2595586ead (patch)
tree09627f85c733f844af02daed570a8c3a35ff1087
parent8147a6ddfd54079ef89f90bf2b5ed3ab6f59bbc0 (diff)
parent05e87d536ed2b7cf1d68135121b630031e5d56c2 (diff)
downloadframeworks_av-450655c10b9ab5aded4350c77a010c2595586ead.zip
frameworks_av-450655c10b9ab5aded4350c77a010c2595586ead.tar.gz
frameworks_av-450655c10b9ab5aded4350c77a010c2595586ead.tar.bz2
am 05e87d53: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '05e87d536ed2b7cf1d68135121b630031e5d56c2':
0 files changed, 0 insertions, 0 deletions