| commit | 04bf45a3007cf54f61f0c93810c2e12bda831ed7 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Mon Mar 23 21:02:28 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 23 21:02:30 2015 +0000 |
| tree | e4ae5bed69c2a9ef71c4ff2bbdf23c9d7d1e71bf | |
| parent | 151df5db5f7e7b5c094d818bac2c02328eb80b41 [diff] | |
| parent | 221a8277dcafa13da5f994048e921c932506a776 [diff] |
Merge "resolved conflicts for merge of 13d81b6d to master"