Jeff Sharkey 45dec78cde am e4109957: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev ...

* commit 'e4109957ecaabf1e6843a4cde4dcfac9d37fef23':
  Parcel VpnProfile without using disk format.

2012-10-19 11:18:22 -07:00

..

java

am e4109957: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev

2012-10-19 11:18:22 -07:00

jni

am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev

2012-10-17 19:21:20 -07:00

res

am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev

2012-10-19 11:05:23 -07:00

tests

Fix connectivity manager test for tablet with data connection, multi-user support

2012-10-17 12:03:29 -07:00