tree dc68e1a9233db3cfbcbbee31fc01dc94cc3fc15a
parent bd4f2181077ab35a26bcca115c1337e78814bb9d
parent 27f1d674bf9fb53af7facdcb746912e036d5bf75
author Jeff Brown <jeffbrown@google.com> 1350544007 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350544008 -0700

Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev