Erik Kline 08866fcfa5 Merge "Map TYPE_VPN integer to "VPN" string."

2014-11-25 18:46:37 +00:00

..

java

Merge "Map TYPE_VPN integer to "VPN" string."

2014-11-25 18:46:37 +00:00

jni

am 29d1b12d: am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""

2014-11-22 01:23:53 +00:00

res

am c02f304c: am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev

2014-11-25 17:49:24 +00:00

tests

am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev

2014-11-21 22:09:28 +00:00