Andres Morales a6084bbda4 Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: d656955 automerge: c9a7694 ...

automerge: 7628fac

* commit '7628fac99fb23b71ae418b9833bc7e5d534c1e9a':
  Wipe FRP partition if OEM unlock enabled

2015-01-08 16:21:37 +00:00

..

java/com/android/server

Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: d656955 automerge: c9a7694

2015-01-08 16:21:37 +00:00

jni

am 8b2b71f5: am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev

2015-01-07 08:10:11 +00:00

Android.mk

…