tree c3e8d2e95c9b567b224a3828c2247992fb34b82c
parent 0525f95bb11765e074d4f67b90bd0fc6aa34d6b3
parent 3d67c5688f4855acbfd6de103b278ceee74a4451
author repo sync <chiachi@android.com> 1283444784 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1283444784 -0700

Merge "resolved conflicts for merge of 12eaf9d5 to master"