tree eeb8ac4034750833d5a0f52663e5bca9b21e80b7
parent b0cbe18f06ae1d331d636d2ac157a2d5bf434d8b
parent bfc5d010e0c313a081fce393504133b91190fe39
author Tyler Gunn <tgunn@google.com> 1415207028 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415207033 +0000

Merge "Various conference event package changes." into lmp-mr1-dev