| commit | b13f3abfccdf395a066021455be1f3fb1731a876 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Wed Sep 17 10:36:09 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 17 10:36:10 2014 +0000 |
| tree | 6f1aebd139701e5d337b075eb4d356bf9f6b31db | |
| parent | 1284e195d8825fb57687e51f0e731fbb6c4dfb5f [diff] | |
| parent | 46e957203f4eb1e733f24d4b39a7c340376c9b56 [diff] |
Merge "resolved conflicts for merge of 293f3248 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp