| commit | 19c8d5f55b1ff4f6953eb53019d148adab0459a5 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Mon Sep 21 12:28:46 2015 -0700 |
| committer | Yabin Cui <yabinc@google.com> | Mon Sep 21 12:28:46 2015 -0700 |
| tree | f11d3aebe86d9b589724a55b3f55afaa981290ab | |
| parent | a228293f231c513a8690b033ad3c68c7213bc2d0 [diff] | |
| parent | 6239958bddfb47562dc8068977bc1bf695973394 [diff] |
resolved conflicts for 6239958b to stage-aosp-master Change-Id: I66d12e9a15b5e6aecd4938b9ce4ac76a0f3863e4