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