Jeff Sharkey a54020c7ae am 508c9fec: am 21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev ...

* commit '508c9fecb6644a533ae63ff52596f484b1fe2806':
  New "frozen" state during app move/upgrade.

2015-04-30 15:19:41 +00:00

..

java/com/android/server

am 508c9fec: am 21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev

2015-04-30 15:19:41 +00:00

jni

UsbDevice: Add support for retrieving version string for a USB device

2015-04-29 13:05:55 -07:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00