| commit | e4305eca7d4975ec761b1d8937b9d479dfbf2dfb | [log] [tgz] |
|---|---|---|
| author | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 14:57:57 2016 +0530 |
| committer | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 14:57:57 2016 +0530 |
| tree | 337dd1bfd051fdf8806f22aad0b4e3e2f90c9bf5 | |
| parent | ea893d5ca636bd289b09a63b5f1aa6ba1cf376e4 [diff] | |
| parent | 975380a656cd637847a95961f7ed15951a20fcf7 [diff] |
Merge commit '975380a656cd637847a95961f7ed15951a20fcf7' into remote Conflicts: res/values/strings.xml Change-Id: I861287c7c264851566ff265e05dbd01243079e4a