| commit | 6c8d6d74c0ee12e6d57bfaede3f7a713bf82f025 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Sat Sep 13 13:07:59 2014 -0700 |
| committer | Tyler Gunn <tgunn@google.com> | Sat Sep 13 20:10:08 2014 +0000 |
| tree | 2e63c5fe96fe193e990e350cae312e7d78c1e295 | |
| parent | 42e34dea5d20db85f7a002623397eb1b11cc46e1 [diff] | |
| parent | ead6ad8a383d945a4c625cb537372c8ee65f6ab4 [diff] |
resolved conflicts for merge of 66c16547 to lmp-sprout-dev Also fixed issue in TelephonyManager. Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f