| commit | f1530bf3d72315256dd7a2c18ba383dc15445b54 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Dec 18 11:31:54 2015 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 18 11:31:54 2015 -0800 |
| tree | 5a1d9e50b54b9772ef8f79ef02ca7248f9777d61 | |
| parent | a652b7161d3069ba9b5650f1caf741d2588de141 [diff] | |
| parent | 3927089cce9d43a0b517f53fd6a542f07cb0955b [diff] |
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce * commit '3927089cce9d43a0b517f53fd6a542f07cb0955b': Protect some new broadcasts.