| commit | 1a68ba6b85473565de174f72beeb7734e49e0fa0 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Thu Nov 13 20:26:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 20:26:11 2014 +0000 |
| tree | d952ac9b068f536c63cf69f31541f59009f11a52 | |
| parent | 3f8b53cc6282ba01bdb2b438ef6ce7a1f78792e2 [diff] | |
| parent | 338bc5a41854d40dfb35ec2865024d3b2737a864 [diff] |
am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev * commit '338bc5a41854d40dfb35ec2865024d3b2737a864': Zen: Update condition text for current condition.