OSDN Git Service

resolved conflicts for merge of 66c16547 to lmp-sprout-dev
authorTyler Gunn <tgunn@google.com>
Sat, 13 Sep 2014 20:07:59 +0000 (13:07 -0700)
committerTyler Gunn <tgunn@google.com>
Sat, 13 Sep 2014 20:10:08 +0000 (20:10 +0000)
commit6c8d6d74c0ee12e6d57bfaede3f7a713bf82f025
tree2e63c5fe96fe193e990e350cae312e7d78c1e295
parent42e34dea5d20db85f7a002623397eb1b11cc46e1
parentead6ad8a383d945a4c625cb537372c8ee65f6ab4
resolved conflicts for merge of 66c16547 to lmp-sprout-dev
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
api/current.txt
core/java/android/provider/CallLog.java
telephony/java/android/telephony/TelephonyManager.java