Robert Greenwalt 83c0b096b7 am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev ...

* commit '98f81182fb61953e0712bd788941710b6ad842c2':
  Separate voice/data roaming state and type

2014-12-04 20:23:55 +00:00

..

java

am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev

2014-12-04 20:23:45 +00:00

jni

am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c

2014-12-02 23:07:43 +00:00

res

am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

2014-12-04 20:23:55 +00:00

tests

am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev

2014-12-01 20:00:32 +00:00