| commit | ee743e6071787335afce30d8f39e3ce7df9d11ea | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Sun Sep 14 13:58:43 2014 -0700 |
| committer | Yorke Lee <yorkelee@google.com> | Sun Sep 14 13:58:59 2014 -0700 |
| tree | 989e77c2e15214532a957c58fc353ed7b7145090 | |
| parent | 61de71647560bb85b1b679073d5a01bcc3f13a36 [diff] | |
| parent | 2ae312e30652a4d0019b17825b58d558c4483a58 [diff] |
resolved conflicts for merge of f3804c3c to lmp-sprout-dev Conflicts: telephony/java/android/telephony/TelephonyManager.java Change-Id: Ibdd0b6c2c9901ec46196ac9460a0908dfb739ad4