| commit | 886de6d1e6edcc1da47297f902b3605c262104e8 | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Thu Jul 24 22:39:54 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 24 20:48:02 2014 +0000 |
| tree | 4a60493104e8a3d45233ade5193e1be545a1bf63 | |
| parent | c5a1e2c87222dcb8d558f0624b0723dfc923907e [diff] | |
| parent | 85d514498488e079477d0ec789abedd721d4ed6f [diff] |
Merge "resolved conflicts for merge of bc3699b1 to lmp-dev" into lmp-dev