Andres Morales 39843bfbed am 29db396e: am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev ...

* commit '29db396ea91651f2f17e21629f782ce4c19e0f33':
  Add a checksum to FRP partition

2014-11-19 18:21:19 +00:00

..

java/com/android/server

am 29db396e: am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev

2014-11-19 18:21:19 +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

…