tree eb2bcf1086fb1d1ac783bad99a9a434ac9bdb26c
parent 2c41c4a2766dcce506fc0e9e361fc8198553293c
parent 20b9cd20644fbb7d3fbc50c78330731bbed004a1
author Adam Powell <adamp@google.com> 1354157352 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1354157366 -0800

Merge "Import assets from UX" into jb-mr1.1-dev