summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-16 05:48:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-16 05:48:25 -0700
commit2efa673c6b6408b306b0372fdf37d232b29c2526 (patch)
tree78a0a5d3f63b46f80c8154f61e235c26ccd4c9d6
parent660833aa5820e94935f19cc1b5484224b13072dd (diff)
parenta43310958cf6777b937f81b399e33ca943192e57 (diff)
downloadlibcore-2efa673c6b6408b306b0372fdf37d232b29c2526.zip
libcore-2efa673c6b6408b306b0372fdf37d232b29c2526.tar.gz
libcore-2efa673c6b6408b306b0372fdf37d232b29c2526.tar.bz2
am a4331095: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'a43310958cf6777b937f81b399e33ca943192e57': Only enforce the encrypted bit in the GPBF, and ignore other unsupported bits.
0 files changed, 0 insertions, 0 deletions