| commit | 2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Dec 18 18:48:59 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 18 18:48:59 2015 +0000 |
| tree | f0340be881b54b3748a02915f531fa16157533fe | |
| parent | d3b6e2d790f95f2fb3d85f0993b90bb8708a6114 [diff] | |
| parent | 5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6 [diff] |
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 * commit '5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6': Protect some new broadcasts.