| commit | 2f9f1fb32f8e2320cbb515c82a3b471da4b6e848 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Sep 23 19:31:44 2015 -0700 |
| committer | Ying Wang <wangying@google.com> | Wed Sep 23 19:31:44 2015 -0700 |
| tree | 4ffe1e833fa4990efb71383cbe2c66dbeb0878a0 | |
| parent | a0af56f6989d250f290257967f64f640531472f5 [diff] | |
| parent | 964f06b1782da73150d2f8953a41208898580061 [diff] |
resolved conflicts for 964f06b1 to stage-aosp-master Change-Id: I0cebad2e440ec7d605afafac893352f06ca2f419