commit | 6df1d4ce96b3ae01edcdfa1015a1848f9fd87dc3 | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Tue Jul 12 02:45:52 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 12 02:45:52 2016 +0000 |
tree | 06bcf0691666a3f928e915fba888ed49d15156db | |
parent | f011f1c97b20fdde1be9a19b4bb12c37f55859e4 [diff] | |
parent | 7478bd51adb2c853e24d3047639a53fb68f39966 [diff] |
Merge \\"Add String Resources for SIP Settings\\" into nyc-mr1-dev am: 29e765fca8 am: 7478bd51ad Change-Id: Ia6f85d2561707bbc7e1d1fe0ddc54712adf471b5