| commit | 105d879ccef2517a07a15f29b956be739504fa73 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Sep 06 16:39:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 16:39:41 2012 -0700 |
| tree | 580839c1603e5ea4675e148dde980af03b95e167 | |
| parent | d4e216bc9eb9b8aecd031a5f3c2a412857333a99 [diff] | |
| parent | 98d9380a5c3c6a6bfa5687af993ea43c882226b9 [diff] |
am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master * commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9': Stop hard-coding sample 12- and 24-hour times.