Jeff Brown 32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev

2014-11-11 22:27:45 +00:00

..

android

Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev

2014-11-11 22:27:45 +00:00

google/android/maps

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00