Narayan Kamath 57616d3e55 resolved conflicts for merge of 18e3727f to master ...

Change-Id: I3d74db13f163ac3f23955b6c7d8469e7a8f93066

2014-11-21 11:57:07 +00:00

..

android

resolved conflicts for merge of 18e3727f to master

2014-11-21 11:57:07 +00:00

com

am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev

2014-11-21 02:46:16 +00:00

jarjar-rules.txt

…

overview.html

…