| commit | e15f580b9d7a555bff96efd3cec195b39637e679 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jan 06 22:29:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 06 22:29:17 2015 +0000 |
| tree | 7ef892f4f4037fbc9bedbc9d017425a9b5087516 | |
| parent | 934c8ddc207133cc26eea9ce10d2079f2d6ff3ea [diff] | |
| parent | 2bd01ebfa99815d4fb6b4e77754146a22cf66d03 [diff] |
am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev * commit '2bd01ebfa99815d4fb6b4e77754146a22cf66d03': Add preferences rendering.