tree 7d48888a084296245588bbad448eb0e07e0282b2
parent 8fc998ae98a7702f8f1ab8293e11a06400e75e9d
parent 19d55e5cb2ea8d6771386e4bc41d79b7cd338e2a
author Jeron Susan <jeron.susan@hi-p.com> 1480642866 +0800
committer Gerrit Code Review <codereview@hi-p.com> 1480642866 +0800

Merge "FPII-2570: Adapt project to compile in Android tree." into fp/fp2_5.1_int