| commit | dd8aa9d3d2b4ba5df960aea630b6b370b0c97278 | [log] [tgz] |
|---|---|---|
| author | Pavel Zhamaitsiak <pavelz@google.com> | Wed Jan 28 21:28:39 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 28 21:28:39 2015 +0000 |
| tree | eb85fc2ca69ea23dda0138c5b6046bdaae8f229e | |
| parent | ab4068c387d9219f1b5f0b596028ccac6cfd2788 [diff] | |
| parent | d67ad203db73eb986f105cf65c85467ad610b221 [diff] |
resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp automerge: d67ad20 * commit 'd67ad203db73eb986f105cf65c85467ad610b221': Add button in "hidden" settings to flip "VoLTE Provisioned" flag