Yaowu Xu 9d8bde85cb Reorder code to be consistent accross branches
This is to make future merge a bit easier.

Change-Id: I1039de381d8fe7b9988b57c23d15d0cb5f2fcd32
2015-10-27 09:04:40 -07:00
..
2015-08-11 17:05:28 -07:00
2015-08-11 17:05:28 -07:00
2015-10-12 10:02:17 -07:00
2015-08-11 21:24:08 -07:00