diff options
| author | Sarmad Hashmi <mhashmi@google.com> | 2016-03-30 18:10:41 -0700 |
|---|---|---|
| committer | Sarmad Hashmi <mhashmi@google.com> | 2016-03-30 18:10:41 -0700 |
| commit | ec4ae9c7ecaa477d81f3097c8e0ae212155a61f7 (patch) | |
| tree | 9a020167f57bfd72d9178322f6a9e3bffd1a4151 /AndroidManifest.xml | |
| parent | b804a67a037bce1fae7f7f81251f60ce82ba54fa (diff) | |
Fix merge.
+Remove line that was removed by ag/874074 and added back in by
ag/886674.
Change-Id: I8f501655356ccf5ff605a0eb705ec38e1ded9025
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions