OSDN Git Service

resolve merge conflicts of 7285e2c2fc to master.
authorRussell Brenner <russellbrenner@google.com>
Wed, 18 Nov 2015 17:13:31 +0000 (09:13 -0800)
committerRussell Brenner <russellbrenner@google.com>
Wed, 18 Nov 2015 17:13:31 +0000 (09:13 -0800)
commitff8a68010e2f7f41da6db592f3eea836e7d9274f
treed3c1ffea0d16d8f174591a25a5688b80cacf522f
parente5f836b010ca30130eb2b4873a01e0b18a263cc1
parent7285e2c2fc396cb64b18a234bc8d863cd698d8e2
resolve merge conflicts of 7285e2c2fc to master.

Change-Id: I56ebcc0dac917791b19ee308eed30bb51267a817
src/com/android/settings/MasterClearConfirm.java