Tyler Gunn 6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev ...

Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f

2014-09-13 20:10:08 +00:00

..

android

resolved conflicts for merge of 66c16547 to lmp-sprout-dev

2014-09-13 20:10:08 +00:00