tree d50766d5f08027a99850339ff27ab9b7da6a2810
parent 8c60aa385359a53ad8e23dd093114da6f4a55469
parent f1d75a6b035666f473be49a739651d62693c1fde
author Jean-Baptiste Queru <jbq@google.com> 1347990758 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347990758 -0700

Merge "resolved conflicts for merge of 0003d599 to jb-mr1-dev"