OSDN Git Service

Merge "Add support for common encryption" into jb-mr2-dev
authorMarco Nelissen <marcone@google.com>
Mon, 8 Apr 2013 23:39:29 +0000 (23:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 8 Apr 2013 23:39:29 +0000 (23:39 +0000)
commitc4ad3cb07ed76c5697c60285456d9c49675174d9
tree3eb0fa618bc21df3ff96f084ad4491755e8d360e
parent0eee410e473c1546af80c63ec866655a28833f33
parente20a6d5c479909f37af748a81a6e5a5deb7b6e2c
Merge "Add support for common encryption" into jb-mr2-dev