Jeff Sharkey 0970be3923 am 4524e06d: am 571dc539: am 17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev ...

* commit '4524e06de7bfe57ffbde1ee5e7d647a885383686':
  Avoid NPE in forceStopPackageLocked().

2014-11-22 00:00:20 +00:00

..

java/com/android/server

am 4524e06d: am 571dc539: am 17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev

2014-11-22 00:00:20 +00:00

jni

resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

2014-11-12 13:24:42 -08:00

Android.mk

…