| commit | 0f2af74e7e6861402a766301d7f9114f453b0aa1 | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Thu Mar 20 11:45:32 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 11:45:32 2014 -0700 |
| tree | e0fe0df11a2eeb9c80fb7582186f511bbe86a2a1 | |
| parent | 0a6a6b2a7b2c9b24902e5e0d85ccf26f1c958f51 [diff] | |
| parent | 4ef32fda7c6b084b9799e53e3071a1ce5e5b6ac3 [diff] |
am 4ef32fda: Merge "Add ability to add extra settings." into gb-ub-photos-denali * commit '4ef32fda7c6b084b9799e53e3071a1ce5e5b6ac3': Add ability to add extra settings.