| commit | ab4029665bf231459b6a0da34a47e795412c7a57 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <weiwa@google.com> | Tue Jan 14 23:33:32 2014 -0800 |
| committer | Wei Wang <weiwa@google.com> | Tue Jan 14 23:42:41 2014 -0800 |
| tree | c6abf683bf0d75c8d9699472f72001223539d40a | |
| parent | eeb60f9473f2e070228cfaec75e757413a50dcba [diff] | |
| parent | f4f8d9f34669bc67b8cd93e7dc060dfddf3a7e51 [diff] |
Merge commit 'f4f8d9f3' into manualmerge Conflicts: res/values/strings.xml Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c