tree cadfa7bfc3f2600949f8dbeeca01221528b0f801
parent 8990766e446384d739236f776ef6043f62c75785
parent 67d8bd66aaf04805cb8f2616ba964141b865e3b9
author Lajos Molnar <lajos@google.com> 1411133026 -0700
committer Lajos Molnar <lajos@google.com> 1411133026 -0700

resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp

Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc