| commit | 261307bebe8986599055bb97d5587977c8da53eb | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Tue May 20 16:29:29 2014 -0700 |
| committer | Raphael Moll <raphael@google.com> | Tue May 20 16:29:29 2014 -0700 |
| tree | ddd070b76d15c9bf63ea5082bee248247a218bf5 | |
| parent | 5f3ed7ddd0b3708baadf5ce357c74e331c16f986 [diff] | |
| parent | bf164835e6be681afb50ca70ee65639ca44fd64f [diff] |
resolved conflicts for merge of bf164835 to stage-aosp-master Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb