tree 60bda0e519dd48900c0d1ffda23538e5f4505efa
parent 2d69cff88e262569ac1284e2048f2a6c3aca6639
parent 4f52061b51325d8de189eb2cb1c1272b2740b8f8
author RoboErik <epastern@google.com> 1316543660 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316543660 -0700

Merge "Add a warning to changing colors in the docs" into ics-factoryrom