| commit | 1795cf5b575367ac8298ef38c281e3af2ba7917c | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu May 15 11:29:19 2014 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Thu May 15 11:29:19 2014 -0700 |
| tree | cb1b8d7d12415b93c2c7693fd66971cc15283fd5 | |
| parent | 2d8897670a685e9e5c2959e84177d5a13e5ecb1e [diff] | |
| parent | e1ff17e25b7dd1ba7ad8a416e5fb7632ef165ec0 [diff] |
resolved conflicts for merge of e1ff17e2 to stage-aosp-master Change-Id: Iea815cb4fc898dee35efc910ce45ef2be6af4aa8