| commit | eba075e5db77966f942c2fb504be7543c69b1f19 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Thu Nov 13 20:39:04 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 13 20:39:04 2014 +0000 |
| tree | a174d4825311f5960af4b311afaeab665356580f | |
| parent | 1eac0a0105ac2e7468b7f2f58993a94cd3e44bae [diff] | |
| parent | 1a68ba6b85473565de174f72beeb7734e49e0fa0 [diff] |
am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev automerge: 1a68ba6 * commit '1a68ba6b85473565de174f72beeb7734e49e0fa0': Zen: Update condition text for current condition.