| commit | eeb60f9473f2e070228cfaec75e757413a50dcba | [log] [tgz] |
|---|---|---|
| author | Wei Wang <weiwa@google.com> | Tue Jan 14 22:33:21 2014 -0800 |
| committer | Wei Wang <weiwa@google.com> | Tue Jan 14 22:33:21 2014 -0800 |
| tree | 3f107ef93cd56665ff3239a4426fca7ab4eaa138 | |
| parent | c0af0c463309edd2fcbf7ff746ecd6128e4ad31b [diff] | |
| parent | fc8d25567124965671a3f32b87d52562918230c5 [diff] |
Merge commit 'fc8d2556' into manualmerge Conflicts: res/values/strings.xml Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99