tree cd5cba5c14fa6ca1e01e523c30124756c33d23d3
parent 06526819255f826aee8935256661d36e90dece31
parent 2110df92d23236b79573dbb8a114502fe75b8c9a
author Amith Yamasani <yamasani@google.com> 1269557859 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1269557859 -0700

Merge "Fix CTS test for system settings. Bug: 2527622"