| commit | fbbd7a8ca83ae673e41cbe2ca3c094a92f964bdc | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Thu Aug 27 11:21:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:21:14 2015 +0000 |
| tree | 8924d31ff2ecb8b544ab35dab62f515aac397156 | |
| parent | 9421649b7a05d918cc4a1da09f1871206860d3a2 [diff] | |
| parent | 76fc1b9b9abaf8321107af7eb412b2639bb89fbb [diff] |
am 76fc1b9b: (-s ours) am fb9c5391: Merge "Change Settings name to "Phone"" into mnc-dev * commit '76fc1b9b9abaf8321107af7eb412b2639bb89fbb':