| commit | 64882b50f849e04ed39bd62120de6637d8664af7 | [log] [tgz] |
|---|---|---|
| author | Vinit Deshpande <vinitd@google.com> | Thu Apr 16 02:36:02 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 16 02:37:46 2015 +0000 |
| tree | 78830ccc8c087948d9895c445a0c68881d9e7e4f | |
| parent | a55ab6fff6264264d6168b33916f294fa8f38866 [diff] | |
| parent | b568bc4366c843ea0c1789f3a2ab2c73d8d0ee81 [diff] |
Merge changes from topic 'mwd-merge-041515' * changes: am d8e3b5e..bc7fc60 from mirror-m-wireless-internal-release am "DO NOT MERGE - Bump version to 5.1.1 automerge: 1c..." am 5d1e929..fae98a4 from mirror-m-wireless-internal-release am "resolved conflicts for merge of 68000907 to lmp-mr..." am bcfe6fa..7d5716e from mirror-m-wireless-internal-release