| commit | 99f1356fbd86dbffffb58ba90ecb376f85398161 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Thu Jun 05 16:02:08 2014 -0700 |
| committer | Andrew Lee <anwlee@google.com> | Thu Jun 05 16:02:08 2014 -0700 |
| tree | 176c960959aef67554e80e2e707ebf81aa931cf9 | |
| parent | de717a16a2ccf4fc8131e7aa437d43a4bc7becd7 [diff] | |
| parent | d29b7ef2868176995cf43b56a28336688f9744d3 [diff] |
resolved conflicts for merge of d29b7ef2 to master Conflicts: res/layout/search_edittext.xml Change-Id: I80be0bb33adb57853a1e9b5ee97966df172bd5a3