| commit | c65c7ae6356ea1b7809854cc205c328abed8d59b | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Sun Jun 01 16:44:28 2014 -0700 |
| committer | Alan Viverette <alanv@google.com> | Sun Jun 01 16:44:28 2014 -0700 |
| tree | 68bd824128d60956596c40cbb393a841e3e044dd | |
| parent | 240b8368ce4de56f5a98f9571896e673424fe02b [diff] | |
| parent | c3710eb20dcdc6fbb37637056454505ed11a0788 [diff] |
Merge commit '6682183b' into manualmerge Conflicts: core/res/res/values/public.xml Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33