Evan Charlton 3caf6fc7df Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev ...

automerge: e2e649f

* commit 'e2e649f5371857e0df41356512c6e06663ba8577':
  Apply @hide / @SystemApi to android.telecom.*

2014-11-10 20:29:27 +00:00

..

java

Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev

2014-11-10 18:35:59 +00:00

jni

Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev

2014-11-07 19:44:34 +00:00

res

Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev

2014-11-10 20:29:27 +00:00

tests

Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev

2014-11-08 01:57:02 +00:00