| commit | b3d1805d353c6401f8cb37b37cd453a38c482b9c | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Jul 17 07:23:48 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Thu Jul 17 07:23:48 2014 -0700 |
| tree | 1a47410ea8e833047604ab3c9ad9282abf963c70 | |
| parent | 007ce2677fd80bfbe8287f8c4f881dda680e3539 [diff] | |
| parent | 3dfc1c21d58a7a6764a436cbf5c3c8ba09db45e5 [diff] |
merge -s ours 21b0919f to lmp-dev-plus-aosp The change was already merged in aosp.