| commit | ac46f35d6edfe36f0999af12890bd09b19cbbe03 | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Thu Aug 27 14:43:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:43:15 2015 +0000 |
| tree | ddb7904f3df54c14a2f72f0fd2c7645a602433d5 | |
| parent | 082c424f1a57bc8a0c3d6e434b89d038fa8e6031 [diff] | |
| parent | 129487fb0f598085d31b0783fcd52397670dcad3 [diff] |
am 129487fb: am 5af37fff: (-s ours) am 5856975d: Change Settings name * commit '129487fb0f598085d31b0783fcd52397670dcad3':