| commit | 72ea52cb74e56cbb921abdd931fa4b54fb63fe67 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Fri Nov 14 18:55:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 18:55:17 2014 +0000 |
| tree | 4dfcde2c8645eb29a86948933de7a5060df24a55 | |
| parent | a6d094754c716fe0149cd152d9e0bc590ead6628 [diff] | |
| parent | eba075e5db77966f942c2fb504be7543c69b1f19 [diff] |
am eba075e5: am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev automerge: 1a68ba6 * commit 'eba075e5db77966f942c2fb504be7543c69b1f19': Zen: Update condition text for current condition.