| commit | 82ce720ff3dfded158bade33eb32e37eeec7b714 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Tue Sep 09 13:57:54 2014 -0700 |
| committer | Jeff Hao <jeffhao@google.com> | Tue Sep 09 13:57:54 2014 -0700 |
| tree | b94c3390a4eee38a43e99537e6ca8a4dfe7f726e | |
| parent | afeac8f4798db4028b107c05f8fd700b7571f5b7 [diff] | |
| parent | 52b75281cc6d06b96cbab57da0356075bbbaa384 [diff] |
resolved conflicts for merge of 52b75281 to lmp-dev-plus-aosp Change-Id: I7226868522e2e0d8a772f55140f5db8fc3e7c542