Wink Saville 07fb24576a am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev ...

automerge: 68c21d6

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
  Additional changes to SubscriptionManager API as per API council.

2014-11-21 02:39:23 +00:00

..

java

am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

2014-11-21 02:39:23 +00:00

jni

resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 15:41:25 -08:00

res

am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev

2014-11-21 01:38:21 +00:00

tests

am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev

2014-11-21 02:35:36 +00:00